projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9748591 7254a30)
bitkeeper revision 1.1669 (42a1c87fJjvGo-daXN_d0s-Pg-eAEQ)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 4 Jun 2005 15:27:59 +0000 (15:27 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 4 Jun 2005 15:27:59 +0000 (15:27 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
Unnamed repository; edit this file 'description' to name the repository.